Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 12:11:51 +0000 (12:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 25 Jun 2010 12:11:51 +0000 (12:11 +0000)
commit0722a0652d8160485850d0853c1fb720b8f41797
tree8b4183d29bd58f86232a6329a570c616b78bc0bc
parent0ae1da2df929d0a3b7465a2e431926dc31ae242b
parentca32755a0d469e7b4422b5831b33ce49e3c622bd
Merge from mainline.